From e62845c173978ee1750fcd98992962d4bf23b915 Mon Sep 17 00:00:00 2001 From: Behnam Esfahbod Date: Wed, 30 Aug 2017 17:00:04 -0700 Subject: [PATCH] [src/doc/book] Update 03-03-config.md from config.md --- src/doc/MIGRATION_MAP | 1 + src/doc/book/src/03-03-config.md | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 src/doc/MIGRATION_MAP diff --git a/src/doc/MIGRATION_MAP b/src/doc/MIGRATION_MAP new file mode 100644 index 000000000..2ad84e165 --- /dev/null +++ b/src/doc/MIGRATION_MAP @@ -0,0 +1 @@ +config.md book/src/03-03-config.md diff --git a/src/doc/book/src/03-03-config.md b/src/doc/book/src/03-03-config.md index 03ed5b9f8..4768957f1 100644 --- a/src/doc/book/src/03-03-config.md +++ b/src/doc/book/src/03-03-config.md @@ -58,18 +58,19 @@ vcs = "none" # For the following sections, $triple refers to any valid target triple, not the # literal string "$triple", and it will apply whenever that target triple is -# being compiled to. 'cfg(...)' refers to the Rust-like `#[cfg]` syntax for +# being compiled to. 'cfg(...)' refers to the Rust-like `#[cfg]` syntax for # conditional compilation. -[target] -# For Cargo builds which do not mention --target, this is the linker -# which is passed to rustc (via `-C linker=`). By default this flag is not -# passed to the compiler. -linker = ".." - [target.$triple] -# Similar to the above linker configuration, but this only applies to -# when the `$triple` is being compiled for. +# This is the linker which is passed to rustc (via `-C linker=`) when the `$triple` +# is being compiled for. By default this flag is not passed to the compiler. linker = ".." +# Same but for the library archiver which is passed to rustc via `-C ar=`. +ar = ".." +# If a runner is provided, compiled targets for the `$triple` will be executed +# by invoking the specified runner executable with actual target as first argument. +# This applies to `cargo run`, `cargo test` and `cargo bench` commands. +# By default compiled targets are executed directly. +runner = ".." # custom flags to pass to all compiler invocations that target $triple # this value overrides build.rustflags when both are present rustflags = ["..", ".."] -- 2.30.2